bitkeeper revision 1.1236.1.23 (421f3b04FuVFrUEUrYIs2_3sbFngVg)

Merge burn.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into burn.cl.cam.ac.uk:/local/scratch-1/maf46/xen-unstable.bk

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --cc xen/arch/x86/domain.c
Simple merge

diff --cc xen/arch/x86/mm.c
Simple merge

diff --cc xen/arch/x86/shadow.c
Simple merge

diff --cc xen/arch/x86/vmx.c
Simple merge

diff --cc xen/arch/x86/x86_32/traps.c
Simple merge

diff --cc xen/include/asm-x86/shadow.h
Simple merge